fixed some compile warnings

diff --git a/ChangeLog b/ChangeLog
index f9d94d386a30125d0c411bcecea6e28841f65d1d..0b5a290ecb8fa8a48865f09c4a9cb15272c39f7a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-02  Øyvind Kolås  <pippin@gimp.org>
+
+       * extensions/gggl.c: (table_init): Fix some compile warnings.
+
 2006-06-02  Øyvind Kolås  <pippin@gimp.org>
 
        I'm not entirely sure about installing babl-classes.h like this, it

diff --git a/extensions/gggl.c b/extensions/gggl.c
index bf3fe83c8bfe61335e59811fa79ad3f693c342cf..02ae855f8eff7dcea523486efaafb856ac7c4e06 100644 (file)
--- a/extensions/gggl.c
+++ b/extensions/gggl.c
@@ -126,8 +126,8 @@ table_init (void)
       for (i = 0; i < 256; i++)
         {
           float     f = table_8_F[i];
-          unsigned short *hi = ((unsigned short *) &f);
-          unsigned short *lo = ((unsigned short *) &f);
+          unsigned short *hi = ((unsigned short *)(void*) &f);
+          unsigned short *lo = ((unsigned short *)(void*) &f);
           *lo = 0;
           table_F_8[(*hi)] = i;
         }
@@ -929,7 +929,7 @@ conv_rgbaF_rgbA16 (unsigned char *src, unsigned char *dst, long samples)
     }
   return samples;
 }
-
+#if 0
 static INLINE long
 conv_rgbaF_rgb8 (unsigned char *src, unsigned char *dst, long samples)
 {
@@ -954,6 +954,7 @@ conv_rgbaF_rgb8 (unsigned char *src, unsigned char *dst, long samples)
     }
   return samples;
 }
+#endif
 
 static INLINE long
 conv_rgbaF_g8 (unsigned char *src, unsigned char *dst, long samples)